Merge from emacs-23; up to r100581.
authorGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
commit2c5d123b7538401e15d27c57a1484901615dfaf2
tree5143502bd31089f536a933d142b7b6c37e7425b5
parent6dc622df679160a19142a55d9cb921a093705cac
parent44f9ebf07348a096ea96da9433d65f9e506ed8c6
Merge from emacs-23; up to r100581.
24 files changed:
doc/emacs/ChangeLog
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/fixit.texi
doc/emacs/frames.texi
doc/emacs/help.texi
doc/emacs/macos.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/rmail.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
lisp/ChangeLog
lisp/progmodes/python.el
lisp/vc/diff-mode.el